the final version with Jane's changes