Before adding the Elegant Pony