Integrated the rest of Supat's content.