More BROM work

Every little bit helps in some why somewhere right ;)