change to Jpa