Changes for KISS (Keep It Simple Stupid