clean up, added support for desktop version