removed copy paste bits