Updated version 2.0