Automated some lines to run streamlined