merge danny's changes