After merge with refactored desktop version.