added persistencelayer. remove one breakpoint