Tidied up requirements.