Changes for final site