Added another method for James to have a merge error on