Updated 3 & 4 again