updating james's changes