Updated so it now compiles on the original engine