Changes for coordinator