change the TODO to the information provided by Paul