Fixed Connor's mess