Allan's stuff merging to kleons