Changes for final