First set of edits to support RigWatch/Squints