Logger changes
	- Enclosed macros in while loop