code needs refactoring , deleted starter