changes were made to support jz's project