@moira improvements part one