Added on/off and deeper integration