Bringing back Janek's changes