Updated to version 2.8