fixed framework to support on / off