Updated with layers