Not sure if it's still in use but added support for active mode