Feature/update cupcake