finished fixing #main