modified and removed