Changed some method signatures