some changes, still not functional