Made all modifications based on first team members' feedback.