solved state final touches