Updating prototype from tombye update