Added back in file existing check