Bringing in changes gathered by @myell0w