Update latest changes from Joseph