changes from khubbaib