Add new comment

I think this code needs a review. I'll try to find time to do this. thanks for bringing this to my attention.