Changes to support user testing