Impletmented Boss Cynthia's suggestions.