updated to class structure