Continue to improve for #5