Removed some requirements