Change to StackClass