Additional updates based on Kevin's suggestions