Update to Active Button API