Added maps
Merge fix
fix two