Tidied up requirements