From now working also wihout JS