changed some names of methods