made checks dynamic