Corrected 1 and 2