Made first modifs