A lot of changes. Using another way to save/load context