Change to 4.8 & Add more flags