Applied Aesh changes