Small changes focus on save - 2