More changes as per the reports of qwazix