Shadow pieces, more tweaks to come