Updated feasibility check