optimized map slightly