Latest Chnages -  Code to be refactored