Changed a Comment Logic