changed some method interfaces