added Beavings changes