Coorection for merging issues...Should be OK now