Updated with debug macroses