Two subclasses for discardables added, testing needed