Restored some values after testing