merging changes from micah