Updated core engine