methods changed to suit new DB structure