All the updated code