merges Warrens changes