added a bit of dao