Replaced atoll with more appropriate macro atoul