changed some methodnames