Updated Daisy18 class