Slowly getting the flaws out of the system