modifications for lock & validation