Update the code to suit SAE