removed copy/pasted code