big update after the revision