Updated inline doc
Updated main tasks