Updated with newer file versions