Final Code without TDD added