Fixed and enhanced exaples