Made sure checked in works with wrapper class
Update redundant code