removed some copy/paste