Added default locations + some fine tuning