modifications importantes
fixes after Hao's commit
raph