Updated with phase2 and research