Updated for CS machine