added new style of stub handler