Some changes to program

Some changes