New page up with revised mapping method used here.