Copied over latest update from (github.com/mfreema5/COM530-spwp).