Continuing our ongoing improvement work, Version 1.0.4...