moved requirement to the right place