Updated code to current status