Updated a bit off Mom's suggestions.