I made some changes as per Steve's instructions.