Power Pivot DAX Monthly average

Hi,

I've got the reuslt I want, which is a monthly average but I'm not sure if there's a better way, first I'm getting the avarage using ;

 AvgUnit:=AVERAGEX(VALUES(Table1[Date]),[Total Units])

And then Calculate ;

   CALCULATE([AvgUnit],ALL('Calendar'[Date]),VALUES('Calendar'[MMM-YYYY]))

Is there a better or alternate way of doing this, also I did try using variables but that didn't work I'm preusuming due to not being affected by the calculation filters.

Example attached.

Richard.