solved two probs
solved two probs