Added some columns per Adam Hitchcock