(i made more changes)