Final update version 3.0
