restructure to allow more examples