minor changes to dal, but still needs work