made minimal changes to get this to persist (avec Spring)