performance improvements

Change-Id: Ieb35a9206dc1c1a41b76c37976fda0af9089e104