dropped some redundancies