Improved some example cases