some changes due to python