Updated with the new 3.0 version