Analysis code updated