modified Hour 15
merged stuff