reverted some code to fix the mobile side