We could optimize your build all day long but honestly you should just follow this one. No need to reinvent the wheel. Maybe ask the author whether something changes in 1.1.7