Update stuff to @lomarb