fixed danny's mistakes