Yu - added edit map feature