CODE AFTER 17.01.2016