Updates required by Bob

Some refactors/modifications