reordered some methods