Updated to version 2.6