Updated (cleaned) analysis