Made the updates and changes
Clean and Build