Added better copy for non-ui cases. changed logic.