Added changes by Robert