NEW MAP ! + cleaning