changing stuff -- jarret
merging fixed