added maptable, moduified stuff