changes to match current project setup