Another attempt to fix my flaws.