before merge with desktop version