Replaces old way with new macro