edits from Casey on Kitty post