got rid of duplicate method