Added shadowing detection