Changed: Comments separate