collaboration stuff && made it nicer