Merging Pierre louis's new viking gem as a fork of the old one, providing consistant naming and history