fix bugs issues
new chages