Feature/logan/26 edit dreams