Fixing the broken pieces....