changed order for comments