Latest changes from Steven.