Merged nice changes, updated IR code to match the table