More work on core engine