tweaks and make it usable on cluster