12/7/14 fixed database