removed shotgun added modified files