Updated Calabash script