changes for mobile/desktop + db