more changes (almost there)