changed some various methods