Added a bit of randoms stuff