[ENYO-19] more commits for work