Added some helpful stuff