Added some neat stuff