Adapted version of the advanced tutorial for the next release