Some simple changes

Some simple changes