fixed design flaws