Reordered some Methods