main files and calc
updated plots