Here's a change from some feedback