modify references, add the rest of details