Added missing fitures 24, 25