Added some recommendations from Connie.