Working commit with UI