Worked a bit on saved data, trying to solve #4