removed some unnecessary duplication