Input check conditions added