solved two problems