got rid of not required direct access to map