changes for ticket number 1230,1232,1229,1228,1218,1170,1180