updating for php refactor