Shamika's changes incorporated