fixing the id thing once and for all, i think