working bot before merging
removed map.o
merged