Rename from select to map
Removed un-needed initialization
Added needed initializations