Quickfix3

After several friends tests there's some flaws.