get a bit closer to fixing everything