Speed things up!!

Change-Id: If53cba16d5385532fa53d77a829866c082808926