Updated some code, no new functionality