start to do some modifications