changed to suit live db