Added kalodsun changes