Saved some minor changes