updated to reflect current state of project