wip
episode 15
some changes