Add level 21 and fix a small bug