ADD few TODO in rapport