Expand comments, No changes to logic