made order of function calls a bit more logical