fix angle and one at a time for now.

Change-Id: I2036f20a560d46b2c0b03a490b6c00924e8030ce