Old commits from Barkot/Samin?

Not important, just so that no work is lost