Completed changes from ENYO-40

Second attempt from @webOS101 for ENYO-40.