persistence added, to be tested on Jay's phone