more changes, trying to find the problem