Updated gists for some edge cases