I did a couple of changes as per the comments from Marion