Added a fancy new feature