gg tom, gg
Requested fixes