Bob Smith requested feature update

I wanted to make thee changes because they are lovely.