removed haste update conditions