Adding new features and changing the advance calculation.