Updated version 1.1