Add Debug macro && other attempts