Further update for archive cropping