References tweaking
Final version?