updated project, should all work now