Added changes from testing