Map optimization

shape