Include contributions from Josh and Brad