Modified as discussed