OOP-skill up! Now used map-style.