fire marshall bill revamp