Moved auxiliar code. (Build currently broke)