Updated to incorporate all team members parts