updates from http://clippy.in/b/YJLM9W