Updates from jbart