merging changes from afternoon