more changes... doesn't quite compile