Added level, fixed saving