Add changes suggested by @Jack_Franklin