Improvments to the X7 engine