Added a few stuff