v1.1 - change css-logic