added maps
but need to refactor code