Updated to version 3.0