Changed around some requirements...