Updated in response to comments from popcornmix