New updated code