Adjusted maps again