PONG
Bug fix based on refactor the other day.