standing on eachothers toes

Change-Id: I66a395b3af11a191215538bc8033b41facf558b7