Update for statement & functions