Bug fixing (25,26,27)