Easier development (35/40)

Easier development