partial commit for switching to jersey