working on the new look 30.03.14