Merged to fix errors