Version 2.5.0.0 ready