hours fixed
merged