that works like before but not like it should