Implemented feedback from Tim