Ch.6 with location saving