further engine improvement