Added pony feature #2