Modified maps a bit