Easier development (16/40)

Easier development