Reordered the last commit to a better layout of the methods.