Updated with new layers