Updated to allow local compilation