modal now working in map and normal forms