updating to use @atduskgreg class