Updated w/ bd62150d5c. Let me know what you think.