Close #135 - amd using global dollar