Task05,06 + refactoring