deleted two buggy lines