reworked for project