Validation, refactoring, new parameter
updated spinner & final working code task closed in JIRA