Corrected 2-1 (with a let if) added 2-3, still need to implement width
and height