Changes

I'll Do Hardcoding on the Details