CODE AFTER 01.05.2016 WORK