Including Shane's changes