Merging from mondayrain