Changed completely to new mapmanager