Updated for submittal