Changed Main Methods