small changes on mapping