Merged updated code