after some tweaks