tweaked things
Merge commit