Comments and editor added