Moving from fixed properties to methods to recompute correctly after any changes