did some stuff, now changing it all again