Small adjustment based on Uncle's request