Added New Methods, Remove useless buggy code.