simplifying wrapper a bit