Added YJ's code to project