updates to increase compiling speed