Updates to Joint branch