Improving auxiliar functions.
Making progress