updated to python 2.7 and reordered