Added some stuff for testing.