Added more local storage variables

....