rework usage a bit