horse instead of pony
small bug fixed
type fixed and rm deprecated proxies