wip - Fixing examples