Added a bit more stuff