Updated version 1.0