change back some macro