Jimmys updated code