updated call handler