Overhauled map system