added and deleted a few lines