Fixed and extended engine, plus style upgrade