done 7.12.04