added IR and organize