changed lots of mapping