Updated to work locally