Fix issue with first attempt, add Shadow support.