Mostly done with contributor aspect