some tweaks (experimental)