naming fixed + 
calculated data dao and controller improved