Finished upgrading FAQ 001 and 003