Change comment as well?