Changes made for design Expo
Added MIT Header
Merged Yao's Changes