Updated to remove other requirements