few changes to map