added seperate on and off tables and onoff_pairs