Added some nifty stuff