Updates by cliff jones