Updated with layer comps