Added/ reorder comments