Changes for final output