Trying on cluster again

Maybe final version?