added conditions and constants