changes, still not functional