removed repeat code