Updated Shadow Implementation (wip)