Hopefully fixing the engagement order