FRONT END CHANGES
First pass