added conditions