Added map, not working
Retry of previous