Added and moved a few other requirements