Removed first requirement, moved other requirement