reworked things, easier to use