Remade the constructor