added task#5 and task#6