Improvements after testing.