Update geometry

Added new methods to determine when to update variables, removed old
ones.