simplified Map and added Score