Added ADX full calcs