Probably the last commit, JPA bonus assignment finished