few call handler changes