Making all different versions work