converted to straight JPA