Easier development (30/40)

Easier development