Edited for CM-10.2