Made Chnages for proper build