Vinay - 5.1 speedup, still not correct, new make structure