added persentation - fixed behaviour