removed distance stuff