cleaning up and working!