took out more broken id stuff