Broken, but cleaner