Updated code after today