Updated to current status