New and updated code