improve old files handling