Modified to avoid saving over previous runs