removed comments
added persistence