Even more corrections
Even more corrections part 2