Add solutions to 20.4