Latest code Desktop and Mobile with History Updated