Completed both problems!