removed dupe code