Moved the components back in place from testing.