removed some repitition