[IMP]Improved if condition seted and instead of or.