Fix And Update