add aliasas and change order