changed: some stuff around, but it still doesn't work