cleaning up i think, i dont remember