Changes so that it's able to handle new data
Authored by: ross_drew 2010-09-30
Parent: [r37]
Child: [r39]