Moved lines into main section