project refactor with new master 2