Some fixes and Collaboration Code Added Again