Updated project and unproject code