Added changes from edge patches