Added and moved requirements according to our meeting.