Klunia 5/27 update

we should expect to see these changes in 2-3 months