Changes for @ISA