new logic for evaluation locking;