made Eavu more dynamic