Added new feature from Super