separated files and better plot control