Changed over to some different code (test)