Moved class from T01 to T02