bug fix v1.1 for id
resolve merge conflict
changed cupcake to cake