add some modifications