got 25. removed unneeded stuff in 24