Removed unneccessary code | Added Progress Indicator