Challenge fix and added save records setting