Changed map transfer logic