Adding changes from joshualande.github.io