more icing (needs tests)