added few lines to be ready to be ran at PSI