rachel changed some logic. Not sure what