Make GitLab issue 42 perform under 4.5s

As of yesterday we are executing in 5 seconds, we need to get it under 4.5 seconds by the end of this milestone.

Screen_Shot_2016-07-07_at_08.15.13