Got rid of global calls - uses macro syntax now