Updated comment blocks