changed names of some methods