Updated to support requested changes from JLindquist