Added changes with crichton stuff