changed some method signatures