refactored to make adding additional office more simplistic
merge confict