Doing some crazy changes to KISS