Some changes in response to Josh