changes to support local development