second set of changes after moving from B.00.42, improve triggers
first set of changes after moving from B.00.42
Last version tested in room b.00.42