Added changes from old feature branch