made a couple of tweaks for Lauszus