few changes based on Tom's feedback