Fixed main section and added noreplace