updated for new 2.6 stable