Updated version 3.0