Slight adjustments to the code.