Some necessary changes