Local storage implemented. Better User experience