edited problem #1 & #2