add in 2015 bits and use new DB fields