changes to support use with Opal