Little changes in the basic.py