finished adapting maps to new pattern