Cleaner Rapture code thanks to @propensive