Changed over to using paths now