more work on waial integration