final version done without transitions