Made lots of Improvement both funct & coding