Added some other bits