Updated some old methods