Updated to version 2.5