Updated code again