Big speed improvement

Change-Id: I7e34c4371c0bbcc8acf86221ca9c81542b7e5a32