cleaning up the mess part II :D