Edited Superclass