added more if