performance tuning

Change-Id: Ib714207a6bc9ec2c8112dfb857f16ddd83117fc1