22 more functions added