Requirements updated, corrected