just some modifications