All points in the this file related issues are corrected