added dl and a little clean up