Map almost working fine