add R1,R7,R28, M calculations
remove date filter