Readd missing codes due to conflicts in merging