Robert Masen re-work to allow code in conditional blocks …