Remade it a bit