Core comment changes