removed copy/paste code