Fork of intel with my changes