With all the feedback from Kevin and a little bit prettier