conditionals done for move on