issues 17-20 == CH-12, FI-7, FI-8, GB-13