Changing to be more in line with base project