Version 2 Added local storage