removed only_if statement