added wrapper class
added wrapper class (again)