merging with Guys changes