Changes started from Sprint Demo comments 11/6