changed names and reordered methods