fixed quality flaws - iteration 2