removed dependency on o-assets