Updated with call functionality