- Removed some project specific code to make more abstract