TODO: added notes from QA.