more changes - still working