credit to valepa (?) just added deco and a switch...