simplified one more if