Changes to area calculation