change to use wrapper class