New features, refactored old ones.