updated pagle and tinkmaster