removed maps. not ready
merge conflict fixed