X macros fully added