corrected wrapper class