Added rectangular and localstorage