modifications to work better with jelly