update before meeting with chris to fix bugs