Changed the definition of some AuxList functions, prepared for merge