some modifications...