This still needs checking - but updated some missing requirements.