updated version of project 1018