Optimizations

Change-Id: Ia001d8edc31f37853380d575be0b7cd849501d8c