Ellegant fix.
Clean up
Prepare to test.