changes to accommodate legacy