followed malachite's changes