Added a couple of stuff