added tweaks and changed usage