-Latest fixes done live