calculated data dao ready but needs testing