Minor changes
Almost Done