fixing issues with staging so that it can have maps as well