Finally understood cake pattern fixes #4