Working on mapfactory