HALO: smoother operation

Change-Id: I33dbf961d559715eb005b0505efef52d992016b8