Get rid of duplicate method