Modified a bit to remove some mistakes