Level 19, 22 added and tested