Changed Main CPP