Updated my solution on group challenge