adding 21 functionality