little changes in code