Pulls in josh+daniel's changes.