changes to simplify local development