Frustrated

Fixed, before shaping