Simplified, UI state not toggled anymore
Changed base impl